Fixed src_channels/dest_channels confusion. (Again caught by Tomas Ogren's

2000-01-05  Owen Taylor  <otaylor@redhat.com>

	* gdk-pixbuf/pixops/pixops.c: Fixed src_channels/dest_channels
	confusion. (Again caught by Tomas Ogren's Purify)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index beeafad2236197d6e4c8cef8d0452bd71c436ec0..4d23b7030f73c265c847f6a25bbed9cd6b282906 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-05  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk-pixbuf/pixops/pixops.c: Fixed src_channels/dest_channels
+       confusion. (Again caught by Tomas Ogren's Purify)
+
 2000-01-07  Jonathan Blandford  <jrb@redhat.com>
 
        * gdk-pixbuf/gdk-pixbuf-xform.c (gdk_pixbuf_rotate): comment out

diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
index 347dfef3d7b57b4b2dd5e956f754e724f8f2ea8b..cda92da8fbcb7222f6da3caf7ac5fff5e106981c 100644 (file)
--- a/gdk-pixbuf/pixops/pixops.c
+++ b/gdk-pixbuf/pixops/pixops.c
@@ -703,7 +703,7 @@ scale_line (int *weights, int n_x, int n_y,
          unsigned int r = 0, g = 0, b = 0, a = 0;
          for (i=0; i<n_y; i++)
            {
-             art_u8 *q = src[i] + x_scaled * dest_channels;
+             art_u8 *q = src[i] + x_scaled * src_channels;
              int *line_weights  = pixel_weights + n_x * i;
              
              for (j=0; j<n_x; j++)
@@ -740,7 +740,7 @@ scale_line (int *weights, int n_x, int n_y,
          unsigned int r = 0, g = 0, b = 0;
          for (i=0; i<n_y; i++)
            {
-             art_u8 *q = src[i] + x_scaled * dest_channels;
+             art_u8 *q = src[i] + x_scaled * src_channels;
              int *line_weights  = pixel_weights + n_x * i;
              
              for (j=0; j<n_x; j++)